summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-13 00:21:02 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-13 00:21:02 +0100
commit771bb9f2dcd87d16cd0c4d75395ba2a389a6f54e (patch)
tree8643e77bedc3fb3acca2f61ed95c48f318ba4c01
parent9cedebba52b51304a6b812f930499d3347bae28c (diff)
downloadChimère - projet Saclay-771bb9f2dcd87d16cd0c4d75395ba2a389a6f54e.tar.bz2
Chimère - projet Saclay-771bb9f2dcd87d16cd0c4d75395ba2a389a6f54e.zip
Ajout du lien projet
-rw-r--r--static/saclay/css/styles.css6
-rw-r--r--static/saclay/js/interface.js4
-rw-r--r--templates/chimere/main_map.html3
3 files changed, 9 insertions, 4 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 833b504..16c5bcc 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -427,6 +427,10 @@ a.close, a.close:link{
display: none;
}
+.dialog-content {
+ padding-bottom: 10px;
+}
+
.news,
.dialog-content .content{
overflow:auto;
@@ -1074,7 +1078,7 @@ div#sidebar{
div#sidebar-container{
background-color: white;
- width: 100%;
+ width: 283px;
height: 100%;
background-image:url('../images/gradient.png');
background-repeat:repeat-x;
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index ddc4606..0aadafd 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -2,7 +2,6 @@ var msg_edit_route = "Cliquez sur la carte pour tracer le trajet. Chaque nouveau
var msg_edit = "Cliquez sur la carte pour placer le lieu. Pour modifier ce lieu sélectionnez-le puis glissez-déposez pour le déplacer.";
var init_default_message_diag = function(){
- /* TODO : to be removed */
$('#default-message').dialog({
'autoOpen':false,
'resizable':false,
@@ -193,8 +192,7 @@ var connectWebViewJavascriptBridge = function(callback) {
};
$(function(){
- /* TODO */
- // init_default_message_diag();
+ init_default_message_diag();
$('#action-routing').click(routing_panel_open);
$('#routing-button').click(routing_panel_open);
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index ca60e34..a2878d3 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -72,6 +72,9 @@
<i class="fa fa-arrow-circle-left" aria-hidden="true"></i> <p>REVENIR AUX CATÉGORIES</p>
</div>
<div class='footer' id='footer-panel'>
+ <span id='action-project' class='dyn-page'>
+ <a href='/dyn/project/'>le projet</a>
+ </span> |
{% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact" %}</a> | {% endif %}
<a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service & credits" %}</a>
</div>